basic stuff working now