Separate classes made. Work is in progress