Stripped to basic components

Ready for table system