If a NAS counts as a computer that'll be my next investment, either a two bay or a four bay Synology. My current DS108j is filled to the point of breach with b/w Sci-Fi movies.
In case the NAS does not count as a computer then it'll probably either be the newly announced X1000 or some upgrade kit for my PC.