Core functionality up. Needs layout work.